Rename Makefile references from 3.0 to 4.0

This is almost certainly incomplete.
Needs careful scrutiny

diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 6a6d70f496594e2b7cf46ef544f2975fba40e447..1a701ab97eeeab0ef8e5bb604b6b507785810021 100644 (file)
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -10,11 +10,11 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(top_builddir)/tests/gtkgears.o \
        $(GTK_DEP_LIBS)                 \
        $(GDK_DEP_LIBS)                 \

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 710d4a35ec755345c9ca1d48253f25c2ead5774e..31abbc302dc66dade3c39bd061d37eb74a6604a7 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,8 +15,8 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = \

diff --git a/examples/application1/Makefile.am b/examples/application1/Makefile.am
index 114e204fa0c1ba92a9b8299dcdb9ea7cac84a2ff..1dc66df7fe9fcd24b79613409730907f25acdbf7 100644 (file)
--- a/examples/application1/Makefile.am
+++ b/examples/application1/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am
index 5db103723edca0c5c4fb452266d952705da82e25..791335b63a3ceafcb4dd304bb861c3f17a1daa65 100644 (file)
--- a/examples/application10/Makefile.am
+++ b/examples/application10/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am
index 0ecba8a33f67310d45cdbca6f725aa2b00512957..950b43ef7cdeaa4be7a8376fe7ed08de99fdcb85 100644 (file)
--- a/examples/application2/Makefile.am
+++ b/examples/application2/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am
index 0ecba8a33f67310d45cdbca6f725aa2b00512957..950b43ef7cdeaa4be7a8376fe7ed08de99fdcb85 100644 (file)
--- a/examples/application3/Makefile.am
+++ b/examples/application3/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am
index c14a3cbcf1902980a56a9673270c466a46b987b5..20c6b588b7f8b2789efdf2d0604f278113dc8a4a 100644 (file)
--- a/examples/application4/Makefile.am
+++ b/examples/application4/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am
index 2b199f97d953b122d00a3bd71113c2c46c15eefb..e5417b4ea55dbafb48c8e21ceea23a803d028d4d 100644 (file)
--- a/examples/application5/Makefile.am
+++ b/examples/application5/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am
index b8cff5b8fede3eb2f934f619edf01cf45e2e38f6..b8fa33c9aeb31ff31c27ca80115332146885f96d 100644 (file)
--- a/examples/application6/Makefile.am
+++ b/examples/application6/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am
index b8cff5b8fede3eb2f934f619edf01cf45e2e38f6..b8fa33c9aeb31ff31c27ca80115332146885f96d 100644 (file)
--- a/examples/application7/Makefile.am
+++ b/examples/application7/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am
index 5db103723edca0c5c4fb452266d952705da82e25..791335b63a3ceafcb4dd304bb861c3f17a1daa65 100644 (file)
--- a/examples/application8/Makefile.am
+++ b/examples/application8/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am
index 5db103723edca0c5c4fb452266d952705da82e25..791335b63a3ceafcb4dd304bb861c3f17a1daa65 100644 (file)
--- a/examples/application9/Makefile.am
+++ b/examples/application9/Makefile.am
@@ -3,8 +3,8 @@ GTK_CFLAGS =                                    \
        $(GTK_DEP_CFLAGS)
 
 GTK_LIBS =                                     \
-        $(top_builddir)/gtk/libgtk-3.la        \
-        $(top_builddir)/gdk/libgdk-3.la        \
+        $(top_builddir)/gtk/libgtk-4.la        \
+        $(top_builddir)/gdk/libgdk-4.la        \
         $(GTK_DEP_LIBS)
 
 

diff --git a/examples/bp/Makefile.am b/examples/bp/Makefile.am
index d521715eae0657a6e1611a7ad19e68e93b9ee0cd..72dff40bc2100d50af5054b5c284eb763c5fb069 100644 (file)
--- a/examples/bp/Makefile.am
+++ b/examples/bp/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = bloatpad

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 052d4876d3d1b4b0f8860b82b3443c0ac682f233..e1b6d813861bba0dcb390c2bca3ef98a58f82e67 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -190,11 +190,11 @@ gdk_built_sources =                               \
 # setup GDK sources and their dependencies
 #
 
-gdkincludedir = $(includedir)/gtk-3.0/gdk
+gdkincludedir = $(includedir)/gtk-4.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources)
 nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gdk/deprecated
 deprecatedinclude_HEADERS = $(deprecated_h_sources)
 
 common_sources =               \
@@ -206,36 +206,36 @@ common_sources =          \
        gdkresources.h          \
        gdkresources.c
 
-libgdk_3_la_SOURCES = $(common_sources)
-libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
-libgdk_3_la_LDFLAGS = $(LDADD)
+libgdk_4_la_SOURCES = $(common_sources)
+libgdk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
+libgdk_4_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
+libgdk_4_la_LDFLAGS = $(LDADD)
 
 if USE_X11
-libgdk_3_la_LIBADD += x11/libgdk-x11.la
+libgdk_4_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
-libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_4_la_CFLAGS += -xobjective-c
+libgdk_4_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
+libgdk_4_la_LIBADD += win32/libgdk-win32.la
+libgdk_4_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_4_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
-libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+libgdk_4_la_LIBADD += broadway/libgdk-broadway.la
 endif # USE_BROADWAY
 
 if USE_WAYLAND
-libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+libgdk_4_la_LIBADD += wayland/libgdk-wayland.la
 endif
 
 if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
+libgdk_4_la_LIBADD += mir/libgdk-mir.la
 endif
 
 if HAVE_INTROSPECTION
@@ -246,17 +246,17 @@ introspection_files =             \
         gdkenumtypes.c         \
         gdkenumtypes.h
 
-Gdk-3.0.gir: libgdk-3.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS =     \
+Gdk-4.0.gir: libgdk-4.la Makefile
+Gdk_4_0_gir_SCANNERFLAGS =     \
        --c-include="gdk/gdk.h"
-Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = libgdk-3.la
-Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
-INTROSPECTION_GIRS += Gdk-3.0.gir
+Gdk_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+Gdk_4_0_gir_LIBS = libgdk-4.la
+Gdk_4_0_gir_FILES = $(introspection_files)
+Gdk_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdk_4_0_gir_EXPORT_PACKAGES = gdk-4.0
+INTROSPECTION_GIRS += Gdk-4.0.gir
 if OS_WIN32
-Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
+Gdk_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
 endif
 if USE_X11
 x11_introspection_files =              \
@@ -306,17 +306,17 @@ x11_introspection_files =                 \
        x11/gdkx11visual.h              \
        x11/gdkx11window.h
 
-GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS =          \
+GdkX11-4.0.gir: libgdk-4.la Gdk-4.0.gir Makefile
+GdkX11_4_0_gir_SCANNERFLAGS =          \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkx.h"        \
-       --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = libgdk-3.la
-GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
-GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
-INTROSPECTION_GIRS += GdkX11-3.0.gir
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkX11_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_4_0_gir_LIBS = libgdk-4.la
+GdkX11_4_0_gir_FILES = $(x11_introspection_files)
+GdkX11_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
+GdkX11_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
+INTROSPECTION_GIRS += GdkX11-4.0.gir
 
 endif # USE_X11
 
@@ -351,16 +351,16 @@ w32_introspection_files =         \
        win32/gdkwindow-win32.c
 
 if OS_WIN32
-GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkWin32_3_0_gir_SCANNERFLAGS = \
+GdkWin32-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkWin32_4_0_gir_SCANNERFLAGS = \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkwin32.h"    \
-       --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_3_0_gir_LIBS = libgdk-3.la
-GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
-INTROSPECTION_GIRS += GdkWin32-3.0.gir
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkWin32_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+GdkWin32_4_0_gir_LIBS = libgdk-4.la
+GdkWin32_4_0_gir_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
+INTROSPECTION_GIRS += GdkWin32-4.0.gir
 
 endif # OS_WIN32
 
@@ -375,15 +375,15 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 if OS_WIN32
-gdk.def: libgdk-3.la
+gdk.def: libgdk-4.la
        echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
        echo "EXPORTS" >>$@
        objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gdk.def
        mkdir -p $(DESTDIR)$(libdir)
-       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+       -rm $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 else
 install-def-file:
 uninstall-def-file:
@@ -392,7 +392,7 @@ endif
 if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-3.la gdk.def
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-4.la gdk.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
@@ -406,7 +406,7 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
-lib_LTLIBRARIES = libgdk-3.la
+lib_LTLIBRARIES = libgdk-4.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += \
@@ -415,7 +415,7 @@ EXTRA_DIST += \
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-4.la
 endif
 
 BUILT_SOURCES = \
@@ -495,50 +495,50 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
                --sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk-3
+MSVCPROJS = gdk-4
 
-gdk_3_FILES = $(libgdk_3_la_SOURCES)
-gdk_3_EXCLUDES = dummy
-gdk_3_HEADERS_DIR = $(gdkincludedir)
+gdk_4_FILES = $(libgdk_4_la_SOURCES)
+gdk_4_EXCLUDES = dummy
+gdk_4_HEADERS_DIR = $(gdkincludedir)
 
-gdk_3_HEADERS_INST = \
+gdk_4_HEADERS_INST = \
        $(gdkinclude_HEADERS)           \
        $(deprecatedinclude_HEADERS)    \
        $(nodist_gdkinclude_HEADERS)
 
-gdk_3_HEADERS_EXCLUDES = dummy
+gdk_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
+MSVC_INTROSPECT_GIRS = Gdk-4.0.gir GdkWin32-4.0.gir
 
 BASE_MSVC_GIR_CFLAGS =                 \
        $(GDK_CFLAGS_DEFINES)           \
        -I../.. -I../../gdk -I.../../gdk/win32
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect \
-       $(top_builddir)/build/win32/Gdk_3_0_gir_list                    \
-       $(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect    \
-       $(top_builddir)/build/win32/GdkWin32_3_0_gir_list
-
-Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
-Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES)
-Gdk_3_0_gir_MSVC_LIBS = gdk-3.0
-Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS)
-
-GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES)
-GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS)
-GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_3_0_gir_MSVC_SCANNERFLAGS =   \
+       $(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect \
+       $(top_builddir)/build/win32/Gdk_4_0_gir_list                    \
+       $(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect    \
+       $(top_builddir)/build/win32/GdkWin32_4_0_gir_list
+
+Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
+
+GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
+GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =   \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkwin32.h"    \
-       --include-uninstalled=./Gdk-3.0.gir
+       --include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 

diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index f1c392353f24f28ff90e6957b6501f1d588410f6..ff793a7d82ee0b7585db55c75f4d1b835d321b23 100644 (file)
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -2,8 +2,8 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkbroadwayincludedir = $(includedir)/gtk-4.0/gdk/broadway
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \

diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
index 71b6e37210057001f1cf34c20e39a0d9214609f5..654b8f9bb89f27346d411a0fa4529079937d702f 100644 (file)
--- a/gdk/mir/Makefile.am
+++ b/gdk/mir/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkmirincludedir = $(includedir)/gtk-4.0/gdk/mir
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gdk\" \

diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 18fdbd3355a9f631ca112a196db1801f719ecb68..9bd34ef4410e93525477350976c98e3bf8cf6225 100644 (file)
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkquartzincludedir = $(includedir)/gtk-4.0/gdk/quartz
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \

diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 5b2e64e11b768f261ff92f2eaedca7d267744f00..127e091b00f5689c353359facff0db11a2e89bc5 100644 (file)
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwaylandincludedir = $(includedir)/gtk-3.0/gdk/wayland
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwaylandincludedir = $(includedir)/gtk-4.0/gdk/wayland
 
 AM_CPPFLAGS =                                  \
        -DG_LOG_DOMAIN=\"Gdk\"                  \

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 991bf708cbd81cce3a5fb12749a0c77e10c5c62f..8d73e2288910a9d861b528835790a21312c53a6e 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwin32includedir = $(includedir)/gtk-4.0/gdk/win32
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gdk\"          \

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6289f3ac798399dd6a7910a28d95aee6efb7326e..c23352091a337f999b800cbbef98d753b10180a7 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkx11includedir = $(includedir)/gtk-4.0/gdk/x11
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3b76b82db674f7612e0aa9f0d033d35c68e0df79..75bc6f5ef5775ab644bec97eb7d2e7f3375ca5b5 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -48,7 +48,7 @@ gtk-win32.rc: gtk-win32.rc.body
        cat $< >>$@
        echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@
 
-gtk.def: libgtk-3.la
+gtk.def: libgtk-4.la
        echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
        echo "EXPORTS" >>$@
        objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -79,11 +79,11 @@ uninstall-ms-lib:
 endif
 
 libadd =                               \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GMODULE_LIBS)                 \
        $(GTK_DEP_LIBS)
 deps =                                         \
-       $(top_builddir)/gdk/libgdk-3.la
+       $(top_builddir)/gdk/libgdk-4.la
 
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -1081,7 +1081,7 @@ gtk_use_quartz_private_h_sources =        \
        gtkquartz.h
 if USE_QUARTZ
 gtk_c_sources += $(gtk_use_quartz_c_sources)
-libgtk_3_la_CFLAGS = "-xobjective-c"
+libgtk_4_la_CFLAGS = "-xobjective-c"
 gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
 endif
 
@@ -1390,43 +1390,43 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
 gtktestutils.c: gtktypefuncs.c
 
 # target platform:
-lib_LTLIBRARIES = libgtk-3.la
+lib_LTLIBRARIES = libgtk-4.la
 
-gtkincludedir = $(includedir)/gtk-3.0/gtk
+gtkincludedir = $(includedir)/gtk-4.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
-a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
+a11yincludedir = $(includedir)/gtk-4.0/gtk/a11y
 a11yinclude_HEADERS= $(a11y_h_sources)
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gtk/deprecated
 deprecatedinclude_HEADERS= $(deprecated_h_sources)
 
-gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
+gtkunixprintincludedir = $(includedir)/gtk-4.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
-nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources)
-libgtk_3_la_SOURCES = $(gtk_c_sources)
-libgtk_3_la_LDFLAGS = $(libtool_opts)
-libgtk_3_la_LIBADD = $(libadd)
-libgtk_3_la_DEPENDENCIES = $(deps)
+nodist_libgtk_4_la_SOURCES = $(nodist_gtk_c_sources)
+libgtk_4_la_SOURCES = $(gtk_c_sources)
+libgtk_4_la_LDFLAGS = $(libtool_opts)
+libgtk_4_la_LIBADD = $(libadd)
+libgtk_4_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
-libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)
+libgtk_4_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_4_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
+libgtk_4_la_DEPENDENCIES += $(gtk_win32_res)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-4.la
 endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 uninstall-mac-key-theme:
-       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 else
 install-mac-key-theme:
 uninstall-mac-key-theme:
@@ -1435,27 +1435,27 @@ endif
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk-3
 
-gtk_3_FILES = \
+gtk_4_FILES = \
        $(gtk_base_c_sources)           \
        $(gtk_os_win32_c_sources)       \
        $(gtk_use_win32_c_sources)      \
        $(gtk_dbus_built_sources)
 
-gtk_3_EXCLUDES = dummy
-gtk_3_HEADERS_DIR = $(gtkincludedir)
+gtk_4_EXCLUDES = dummy
+gtk_4_HEADERS_DIR = $(gtkincludedir)
 
-gtk_3_HEADERS_INST = \
+gtk_4_HEADERS_INST = \
        $(gtkinclude_HEADERS)   \
        $(a11y_h_sources)       \
        $(deprecated_h_sources)
 
-gtk_3_HEADERS_EXCLUDES = dummy
+gtk_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
+MSVC_INTROSPECT_GIRS = Gtk-4.0.gir
 
 GTK_MSVC_GIR_CFLAGS =                                          \
        $(GTK_BASE_CFLAGS_DEFINES)                              \
@@ -1480,21 +1480,21 @@ GTK_MSVC_GIR_CFLAGS =                                           \
        -I../.. -I../../gtk -I../../gdk
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect         \
-       $(top_builddir)/build/win32/Gtk_3_0_gir_list
+       $(top_builddir)/build/win32/Gtk-4.0.gir.msvc.introspect         \
+       $(top_builddir)/build/win32/Gtk-4_0_gir_list
 
-Gtk_3_0_gir_MSVC_FILES =               \
+Gtk_4_0_gir_MSVC_FILES =               \
        $(introspected_pub_headers)     \
        $(gtk_base_c_sources)           \
        $(gtk_os_win32_c_sources)       \
        gtktypebuiltins.h               \
        gtktypebuiltins.c
 
-Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
-Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
-Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-3.0.gir
+Gtk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_4_0_gir_EXPORT_PACKAGES)
+Gtk_4_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
+Gtk_4_0_gir_MSVC_LIBS = gtk-4.0 gdk-4.0
+Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
+Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 
@@ -1510,14 +1510,14 @@ dist-hook: \
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+       $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
@@ -1549,23 +1549,23 @@ INTROSPECTION_COMPILER_ARGS = \
        --includedir=. \
        --includedir=../gdk
 
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS =                     \
+Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la $(top_builddir)/gdk/Gdk-4.0.gir Makefile
+Gtk_4_0_gir_SCANNERFLAGS =                     \
        --warn-all                              \
        --add-include-path=$(top_builddir)/gdk  \
-       --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-Gtk_3_0_gir_INCLUDES = Atk-1.0
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+Gtk_4_0_gir_INCLUDES = Atk-1.0
 if USE_X11
-Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
-Gtk_3_0_gir_INCLUDES += xlib-2.0
+Gtk_4_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+Gtk_4_0_gir_INCLUDES += xlib-2.0
 endif
-Gtk_3_0_gir_CFLAGS = \
+Gtk_4_0_gir_CFLAGS = \
                $(AM_CPPFLAGS) \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_FILES = $(introspection_files)
-Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
-Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
-INTROSPECTION_GIRS = Gtk-3.0.gir
+Gtk_4_0_gir_FILES = $(introspection_files)
+Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gdk/libgdk-4.la
+Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0
+INTROSPECTION_GIRS = Gtk-4.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -1580,17 +1580,17 @@ endif
 # Installed tools
 #
 bin_PROGRAMS = \
-       gtk-query-immodules-3.0 \
+       gtk-query-immodules-4.0 \
        gtk-update-icon-cache \
        gtk-encode-symbolic-svg \
        gtk-builder-tool \
        gtk-query-settings \
        gtk-launch
 
-gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtkutils.c
-gtk_query_immodules_3_0_LDADD =                \
-       libgtk-3.la                             \
-       $(top_builddir)/gdk/libgdk-3.la         \
+gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
+gtk_query_immodules_4_0_LDADD =                \
+       libgtk-4.la                             \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GMODULE_LIBS)                         \
        $(GTK_DEP_LIBS)
 
@@ -1600,25 +1600,25 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
 gtk_encode_symbolic_svg_LDADD =                        \
        $(GDK_PIXBUF_LIBS)                      \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_builder_tool_SOURCES = gtk-builder-tool.c
 gtk_builder_tool_LDADD =                       \
-       libgtk-3.la                             \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       libgtk-4.la                             \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_query_settings_SOURCES = gtk-query-settings.c
 gtk_query_settings_LDADD=                      \
-       libgtk-3.la                             \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       libgtk-4.la                             \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_launch_SOURCES = gtk-launch.c
 gtk_launch_LDADD =                             \
-       libgtk-3.la                             \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       libgtk-4.la                             \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)
 
 if OS_WIN32

diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 048fe33097608f0c29cb03a290a13522679647c9..c471e7a6caa6992a59ffd9b446ec4892d17cd092 100644 (file)
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 EXTRA_DIST += gailutil.def
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
-gailutil.def: libgailutil-3.la
+gailutil.def: libgailutil-4.la
        echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@
        echo "EXPORTS" >>$@
        objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -30,26 +30,26 @@ uninstall-ms-lib:
 endif
 
 
-lib_LTLIBRARIES = libgailutil-3.la
+lib_LTLIBRARIES = libgailutil-4.la
 
 util_c_sources =               \
        gailmisc.c              \
        gailtextutil.c
 
-libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
+libgailutilincludedir=$(includedir)/gail-4.0/libgail-util
 
 util_public_h_sources =                \
        gailmisc.h              \
        gailtextutil.h          \
        gail-util.h
 
-libgailutil_3_la_SOURCES =     \
+libgailutil_4_la_SOURCES =     \
        $(util_c_sources)
 
 libgailutilinclude_HEADERS =   \
        $(util_public_h_sources)
 
-libgailutil_3_la_CPPFLAGS = \
+libgailutil_4_la_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
@@ -59,39 +59,39 @@ libgailutil_3_la_CPPFLAGS = \
        -DGDK_DISABLE_DEPRECATED\
        -DGTK_DISABLE_DEPRECATED
 
-libgailutil_3_la_CFLAGS = \
+libgailutil_4_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \
        $(AM_CFLAGS)
 
-libgailutil_3_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+libgailutil_4_la_LIBADD = \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)
 
-libgailutil_3_la_LDFLAGS = \
+libgailutil_4_la_LDFLAGS = \
        -version-info $(GAIL_LT_VERSION_INFO)   \
        $(no_undefined)                         \
         $(LDFLAGS)
 
-gailutil.lib: libgailutil-3.la gailutil.def
-       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
+gailutil.lib: libgailutil-4.la gailutil.def
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-4.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gailutil-3
+MSVCPROJS = gailutil-4
 
-gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
+gailutil_4_FILES = $(libgailutil_4_la_SOURCES)
 
-gailutil_3_EXCLUDES = dummy
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
+gailutil_4_EXCLUDES = dummy
+gailutil_4_HEADERS_DIR = $(libgailutilincludedir)
 
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
+gailutil_4_HEADERS_INST = $(libgailutilinclude_HEADERS)
 
-gailutil_3_HEADERS_EXCLUDES = dummy
+gailutil_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index c20b5bb730dcc38ba7724b993d9210b627e59bee..eb73699640dc8086cd0238d5e0a96bd27e72d88f 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -13,13 +13,13 @@ AM_CPPFLAGS = \
        $(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/immodules
 
 im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_xim_la_SOURCES =            \
@@ -190,7 +190,7 @@ else
 MULTIPRESS_MODULE = im-multipress.la
 endif
 
-imconffiledir = $(sysconfdir)/gtk-3.0
+imconffiledir = $(sysconfdir)/gtk-4.0
 dist_imconffile_DATA = im-multipress.conf
 
 if CROSS_COMPILING
@@ -207,21 +207,21 @@ endif
 # after the libraries are installed in their final locations.
 install-data-hook:
        $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
-         echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-         echo "$(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
-         $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \
+         echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+         echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+         $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
        else \
          echo "***" ; \
          echo "*** Warning: immodules.cache not built" ; \
          echo "***" ; \
          echo "*** Generate this file manually on host" ; \
-         echo "*** system using gtk-query-immodules-3.0" ; \
+         echo "*** system using gtk-query-immodules-4.0" ; \
          echo "***" ; \
         fi
 
 uninstall-local:
-       rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache
+       rm -f $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache
 
 if BUILD_DYNAMIC_MODULES
 
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES =                                \
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
+       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
 
 EXTRA_DIST += README.multipress
 

diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
index d2d434fec3e94774b3bb963c42f88c94292b84e8..2a1811f41cda4ab7055b68b78adbf5657ee07a16 100644 (file)
--- a/modules/printbackends/cloudprint/Makefile.am
+++ b/modules/printbackends/cloudprint/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cloudprint.la
 
@@ -32,7 +32,7 @@ libprintbackend_cloudprint_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_cloudprint_la_LIBADD =                 \
-       $(top_builddir)/gtk/libgtk-3.la                 \
+       $(top_builddir)/gtk/libgtk-4.la                 \
        $(REST_LIBS)                                    \
        $(JSON_GLIB_LIBS)                               \
        $(GTK_DEP_LIBS)

diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 09a9f893cfd6056c3fc5208d3f80d8a45ed028e9..8f36a87fa85f2f54079c04ebc843503757274f63 100644 (file)
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -14,11 +14,11 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(COLORD_LIBS)                  \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cups.la
 

diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 9b51bf4e12a1a80d847e0f3280418b03baf6f382..ffdd81676ae32b92165e22c943ce0d022d234fee 100644 (file)
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-file.la
 
@@ -25,7 +25,7 @@ libprintbackend_file_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_file_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_HEADERS =                       \

diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 5a7517009e7a0586c42ee8397229d68ef13ee42b..79345edef95e15fa57fe9912ed4d8898c47a2937 100644 (file)
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-lpr.la
 

diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 7176eba2ddf5cd2bb1fb32c1ce7f3dda81103aa6..48ae2ca729268110dfc47f2ab97c7d4b41074558 100644 (file)
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-papi.la
 

diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index bff5e93c7ae6ee1d4195f053ccaa7255a1aafcd9..876ef0f66738b5d90aa3dd836acadcf098168bb0 100644 (file)
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-test.la
 
@@ -24,7 +24,7 @@ libprintbackend_test_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_test_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_HEADERS =                       \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 649981f6d8c256271a4deaeb902af1abe74ce214..1380131cb58cae5a2c8d276faf79c6dd03ca1d3e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS =                               \
        $(GDK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(GDK_DEP_LIBS)                 \
        -lm

diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am
index 8250de6df083ebada857eae0c1b0405b2b86ea46..43dfa6818e202e0763fee6c28ee6d0ab8fcf272b 100644 (file)
--- a/tests/visuals/Makefile.am
+++ b/tests/visuals/Makefile.am
@@ -9,11 +9,11 @@ AM_CPPFLAGS =                         \
 AM_CXXFLAGS = $(AM_CPPFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)                 \
        -lm
 

diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 9fd1fc054d915f7835181cd985f6017d1f9f0ee5..39f1eb7ebaf494c574b4bec4d92913d484335c27 100644 (file)
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -16,8 +16,8 @@ AM_CPPFLAGS =                         \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 # work around random file systems showing up in the file chooser,

diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 2861d4dcd5afaa9b246affbde8a4706e020b6cbd..42bacebed613492e25f63cf399416b25b70a1aa4 100644 (file)
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -13,8 +13,8 @@ AM_CPPFLAGS =                           \
         $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gdk/libgdk-3.la \
-        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-4.la \
+        $(top_builddir)/gtk/libgtk-4.la \
         $(GTK_DEP_LIBS)
 
 TESTS_ENVIRONMENT =                     \

diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index 091591a17402a58aa0b8adb8463ccdccae9dce41..61e68d50e6a6734c9e162c0a1260e9801c6ebf54 100644 (file)
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -18,8 +18,8 @@ AM_CPPFLAGS =                         \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 TEST_PROGS += api

diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am
index 339c47eda0c0b8201ef89bfde291a85039a43609..9c24c2a2df6fb4c2a765c7ddad2f27aa3f4b8739 100644 (file)
--- a/testsuite/css/nodes/Makefile.am
+++ b/testsuite/css/nodes/Makefile.am
@@ -18,8 +18,8 @@ test_css_nodes_CFLAGS = \
        $(NULL)
 
 test_css_nodes_LDADD = \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(NULL)
 

diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index bd7989117a0ae4405c20423a49ee3d916facb021..9f803e6e28cba2d05e9ade1d6b64e876ba796a93 100644 (file)
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -19,8 +19,8 @@ test_css_parser_CFLAGS = \
                $(GTK_DEP_CFLAGS)
 
 test_css_parser_LDADD = \
-               $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+               $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 test_css_parser_SOURCES = \

diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am
index bfdb22bad78b73dcbd07c78316af0f7b98eb6a63..5340de0abcbc3e58abe7e20d98ae157013b1bf04 100644 (file)
--- a/testsuite/css/style/Makefile.am
+++ b/testsuite/css/style/Makefile.am
@@ -18,8 +18,8 @@ test_css_style_CFLAGS = \
        $(NULL)
 
 test_css_style_LDADD = \
-        $(top_builddir)/gdk/libgdk-3.la \
-        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-4.la \
+        $(top_builddir)/gtk/libgtk-4.la \
         $(GTK_DEP_LIBS)                        \
        $(NULL)
 

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 73b4beb4864c97d9a13c34d0183aa9aa4c8248e5..ce67755a15156e46f9ecd8c4c3b5f0aea04f8019 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS =                                 \
 
 LDADD =                                \
        $(GDK_DEP_LIBS)                 \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(NULL)
 
 #TEST_PROGS              += check-gdk-cairo

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index a0f290d75d01b1b0151a8cb7121dba05b008cca6..3dde3a086f6408ffaa51077e09dfed921dca7c85 100644 (file)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -17,11 +17,11 @@ AM_CPPFLAGS += -DHAVE_UNIX_PRINT_WIDGETS
 endif
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = $(TEST_PROGS)

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 068d9f801e63157781669359129b44e95cb72eb5..5d2961b2b9f6badce4f72ab472bf8f1c1bb5833c 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -24,8 +24,8 @@ gtk_reftest_CFLAGS = \
 
 gtk_reftest_LDADD = \
        libgtkreftestprivate.la         \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(GMODULE_LIBS)                 \
        $(NULL)
@@ -44,8 +44,8 @@ endif
 libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
 libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
 libgtkreftestprivate_la_LIBADD =       \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(GMODULE_LIBS)                 \
        $(NULL)